From bd90bfbc964751e58687c769229faea08d943a7c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 9 Jan 2006 18:20:23 +0000 Subject: [PATCH] Don't leak preedit_string and preedit_attrs. (#322332, Paolo Borelli) 2006-01-09 Matthias Clasen * gtk/gtktextlayout.c (gtk_text_layout_finalize): Don't leak preedit_string and preedit_attrs. (#322332, Paolo Borelli) --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ gtk/gtktextlayout.c | 13 +++++++++++++ 3 files changed, 21 insertions(+) diff --git a/ChangeLog b/ChangeLog index b42283bb20..057f8d070f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-01-09 Matthias Clasen + * gtk/gtktextlayout.c (gtk_text_layout_finalize): Don't + leak preedit_string and preedit_attrs. (#322332, Paolo + Borelli) + * gtk/gtk.symbols: * gtk/gtkaction.h: * gtk/gtkaction.c (gtk_widget_get_action): New function to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b42283bb20..057f8d070f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2006-01-09 Matthias Clasen + * gtk/gtktextlayout.c (gtk_text_layout_finalize): Don't + leak preedit_string and preedit_attrs. (#322332, Paolo + Borelli) + * gtk/gtk.symbols: * gtk/gtkaction.h: * gtk/gtkaction.c (gtk_widget_get_action): New function to diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index a73533fe6e..b46d1685ba 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -297,6 +297,19 @@ gtk_text_layout_finalize (GObject *object) gtk_text_layout_free_line_display (layout, tmp_display); } + if (layout->preedit_string) + { + g_free (layout->preedit_string); + layout->preedit_string = NULL; + } + + if (layout->preedit_attrs) + { + pango_attr_list_unref (layout->preedit_attrs); + layout->preedit_attrs = NULL; + } + + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } -- 2.30.2